Skip to content

Update GnuTLS from 3.7.10 to 3.8.5 #3093

Merged
merged 2 commits into from
Apr 18, 2024
Merged

Conversation

pmenzel
Copy link
Collaborator

@pmenzel pmenzel commented Apr 9, 2024

No description provided.

> Drop guile bindings.  See <https://gitlab.com/gnutls/guile/>.

-rwxr-xr-x 1 root root   322080 Aug 24  2023 /usr/lib/libgnutls-dane.so.0.4.1
-rwxr-xr-x 1 root root 11126976 Aug 24  2023 /usr/lib/libgnutls.so.30.34.4
-rwxr-xr-x 1 root root   241384 Aug 24  2023 /usr/lib/libgnutlsxx.so.30.0.0

-rwxr-xr-x root/root    284320 2024-04-09 08:56 /usr/lib/libgnutls-dane.so.0.4.1
-rwxr-xr-x root/root    221024 2024-04-09 08:56 /usr/lib/libgnutlsxx.so.30.0.0
-rwxr-xr-x root/root   8872048 2024-04-09 08:56 /usr/lib/libgnutls.so.30.39.0
    checking for p11-kit-1 >= 0.23.1... yes
    […]
    In file included from /dev/shm/bee-pmenzel/gnutls/gnutls-3.8.5-0/source/lib/pkcs11.c:47:
    /usr/include/p11-kit-1/p11-kit/iter.h:57:62: error: unknown type name 'CK_BBOOL'
       57 |                                                              CK_BBOOL *matches,
          |                                                              ^~~~~~~~
    /usr/include/p11-kit-1/p11-kit/iter.h:66:62: error: unknown type name 'p11_kit_iter_callback'; did you mean 'p11_kit_pin_callback'?
       66 |                                                              p11_kit_iter_callback callback,
          |                                                              ^~~~~~~~~~~~~~~~~~~~~
          |                                                              p11_kit_pin_callback
    /usr/include/p11-kit-1/p11-kit/iter.h:71:62: error: unknown type name 'CK_ATTRIBUTE'; did you mean 'CK_ATTRIBUTE_PTR'?
       71 |                                                              CK_ATTRIBUTE *matching,
          |                                                              ^~~~~~~~~~~~
          |                                                              CK_ATTRIBUTE_PTR
    /usr/include/p11-kit-1/p11-kit/iter.h:82:62: error: unknown type name 'CK_SLOT_ID'
       82 |                                                              CK_SLOT_ID slot,
          |                                                              ^~~~~~~~~~
    /usr/include/p11-kit-1/p11-kit/iter.h:83:62: error: unknown type name 'CK_SESSION_HANDLE'
       83 |                                                              CK_SESSION_HANDLE session);
          |                                                              ^~~~~~~~~~~~~~~~~
    /usr/include/p11-kit-1/p11-kit/iter.h:89:1: error: unknown type name 'CK_SLOT_ID'
       89 | CK_SLOT_ID            p11_kit_iter_get_slot                 (P11KitIter *iter);
          | ^~~~~~~~~~
    /usr/include/p11-kit-1/p11-kit/iter.h:91:1: error: unknown type name 'CK_TOKEN_INFO'; did you mean 'CK_TOKEN_INFO_PTR'?
       91 | CK_TOKEN_INFO *       p11_kit_iter_get_token                (P11KitIter *iter);
          | ^~~~~~~~~~~~~
          | CK_TOKEN_INFO_PTR
    /usr/include/p11-kit-1/p11-kit/iter.h:93:1: error: unknown type name 'CK_SESSION_HANDLE'
       93 | CK_SESSION_HANDLE     p11_kit_iter_get_session              (P11KitIter *iter);
          | ^~~~~~~~~~~~~~~~~
    /usr/include/p11-kit-1/p11-kit/iter.h:95:1: error: unknown type name 'CK_OBJECT_HANDLE'; did you mean 'CKA_OBJECT_ID'?
       95 | CK_OBJECT_HANDLE      p11_kit_iter_get_object               (P11KitIter *iter);
          | ^~~~~~~~~~~~~~~~
          | CKA_OBJECT_ID
    /usr/include/p11-kit-1/p11-kit/iter.h:98:62: error: unknown type name 'CK_ATTRIBUTE'; did you mean 'CK_ATTRIBUTE_PTR'?
       98 |                                                              CK_ATTRIBUTE *template,
          |                                                              ^~~~~~~~~~~~
          |                                                              CK_ATTRIBUTE_PTR
    /usr/include/p11-kit-1/p11-kit/iter.h:102:62: error: unknown type name 'CK_ATTRIBUTE'; did you mean 'CK_ATTRIBUTE_PTR'?
      102 |                                                              CK_ATTRIBUTE *template,
          |                                                              ^~~~~~~~~~~~
          |                                                              CK_ATTRIBUTE_PTR
    /usr/include/p11-kit-1/p11-kit/iter.h:105:1: error: unknown type name 'CK_SESSION_HANDLE'
      105 | CK_SESSION_HANDLE     p11_kit_iter_keep_session             (P11KitIter *iter);
          | ^~~~~~~~~~~~~~~~~
    /dev/shm/bee-pmenzel/gnutls/gnutls-3.8.5-0/source/lib/pkcs11.c: In function 'find_multi_objs_cb':
    /dev/shm/bee-pmenzel/gnutls/gnutls-3.8.5-0/source/lib/pkcs11.c:3247:9: warning: implicit declaration of function 'p11_kit_iter_add_filter' [-Wimplicit-function-declaration]
     3247 |         p11_kit_iter_add_filter(iter, a, tot_values);
          |         ^~~~~~~~~~~~~~~~~~~~~~~
    /dev/shm/bee-pmenzel/gnutls/gnutls-3.8.5-0/source/lib/pkcs11.c:3247:9: warning: nested extern declaration of 'p11_kit_iter_add_filter' [-Wnested-externs]
    /dev/shm/bee-pmenzel/gnutls/gnutls-3.8.5-0/source/lib/pkcs11.c:3248:9: warning: implicit declaration of function 'p11_kit_iter_begin_with'; did you mean 'p11_kit_iter_begin'? [-Wimplicit-function-declaration]
     3248 |         p11_kit_iter_begin_with(iter, sinfo->module, sinfo->sid, sinfo->pks);
          |         ^~~~~~~~~~~~~~~~~~~~~~~
          |         p11_kit_iter_begin
    /dev/shm/bee-pmenzel/gnutls/gnutls-3.8.5-0/source/lib/pkcs11.c:3248:9: warning: nested extern declaration of 'p11_kit_iter_begin_with' [-Wnested-externs]
    /dev/shm/bee-pmenzel/gnutls/gnutls-3.8.5-0/source/lib/pkcs11.c:3275:22: warning: implicit declaration of function 'p11_kit_iter_get_attributes'; did you mean 'p11_kit_uri_get_attributes'? [-Wimplicit-function-declaration]
     3275 |                 rv = p11_kit_iter_get_attributes(iter, a, 1);
          |                      ^~~~~~~~~~~~~~~~~~~~~~~~~~~
          |                      p11_kit_uri_get_attributes
    /dev/shm/bee-pmenzel/gnutls/gnutls-3.8.5-0/source/lib/pkcs11.c:3275:22: warning: nested extern declaration of 'p11_kit_iter_get_attributes' [-Wnested-externs]
    make[4]: *** [Makefile:2874: pkcs11.lo] Error 1
    make[4]: *** Waiting for unfinished jobs....
    make[4]: Leaving directory '/dev/shm/bee-pmenzel/gnutls/gnutls-3.8.5-0/build/lib'
    make[3]: *** [Makefile:2970: all-recursive] Error 1
    make[3]: Leaving directory '/dev/shm/bee-pmenzel/gnutls/gnutls-3.8.5-0/build/lib'
    make[2]: *** [Makefile:2573: all] Error 2
    make[2]: Leaving directory '/dev/shm/bee-pmenzel/gnutls/gnutls-3.8.5-0/build/lib'
    make[1]: *** [Makefile:2327: all-recursive] Error 1
    make[1]: Leaving directory '/dev/shm/bee-pmenzel/gnutls/gnutls-3.8.5-0/build'
    make: *** [Makefile:2252: all] Error 2

[Reported upstream][1]

[1]: https://gitlab.com/gnutls/gnutls/-/issues/1542
@pmenzel pmenzel force-pushed the update-gnutls-from-3.7.10-to-3.8.5 branch from 249413f to 16021d6 Compare April 15, 2024 21:42
@pmenzel pmenzel merged commit e7029e3 into master Apr 18, 2024
@pmenzel
Copy link
Collaborator Author

pmenzel commented Apr 22, 2024

rdesktop winter now aborts with:

Core(error): tcp_tls_connect(), TLS handshake failed. GnuTLS error: The encryption algorithm is not supported.

@pmenzel
Copy link
Collaborator Author

pmenzel commented Apr 22, 2024

For the time being:

@deinemuddah:~$ sudo bee update -f gnutls-3.7.10

@pmenzel
Copy link
Collaborator Author

pmenzel commented Apr 22, 2024

There is a fix upstream, but I downgraded back to version 3.7.10 for the time being in merge/pull request #3098.

Sign in to join this conversation on GitHub.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant